plat/arm/n1sdp: define the uart constants for N1SDP

This patch removes the dependency of the N1SDP on soc
css defines in order to let the N1SDP platform port
define the uart related constants.

Change-Id: If13796f278586a01512ee99615502b30e478189e
Signed-off-by: Deepak Pandey <[email protected]>

diff --git a/plat/arm/board/n1sdp/include/platform_def.h b/plat/arm/board/n1sdp/include/platform_def.h
index fa639ca95a745e4b30b2b8e616dd3a9587e0e086..1556ac7678922daf7318e48724aebdad4ae37e59 100644 (file)
--- a/plat/arm/board/n1sdp/include/platform_def.h
+++ b/plat/arm/board/n1sdp/include/platform_def.h
@@ -8,9 +8,23 @@
 #define PLATFORM_DEF_H
 
 #include <arm_def.h>
-#include <board_css_def.h>
 #include <css_def.h>
 
+/* UART related constants */
+#define PLAT_ARM_BOOT_UART_BASE                        0x2A400000
+#define PLAT_ARM_BOOT_UART_CLK_IN_HZ           50000000
+
+#define PLAT_ARM_BL31_RUN_UART_BASE            0x2A410000
+#define PLAT_ARM_BL31_RUN_UART_CLK_IN_HZ       50000000
+
+#define PLAT_ARM_SP_MIN_RUN_UART_BASE          0x2A410000
+#define PLAT_ARM_SP_MIN_RUN_UART_CLK_IN_HZ     50000000
+
+#define PLAT_ARM_CRASH_UART_BASE               PLAT_ARM_BL31_RUN_UART_BASE
+#define PLAT_ARM_CRASH_UART_CLK_IN_HZ          PLAT_ARM_BL31_RUN_UART_CLK_IN_HZ
+
+#define PLAT_ARM_DRAM2_SIZE                    ULL(0x780000000)
+
 #if CSS_USE_SCMI_SDS_DRIVER
 #define N1SDP_SCMI_PAYLOAD_BASE                        0x45400000
 #else
@@ -57,7 +71,7 @@
 
 
 #define N1SDP_DEVICE_BASE                      (0x20000000)
-#define N1SDP_DEVICE_SIZE                      (0x20000000)
+#define N1SDP_DEVICE_SIZE                      (0x30000000)
 #define N1SDP_MAP_DEVICE                       MAP_REGION_FLAT(        \
                                                N1SDP_DEVICE_BASE,      \
                                                N1SDP_DEVICE_SIZE,      \

diff --git a/plat/arm/board/n1sdp/n1sdp_plat.c b/plat/arm/board/n1sdp/n1sdp_plat.c
index 5aaa7376a42794c6fcfab7b8939778e51e84baeb..3bf1fe6c24862564705d744511b8a498e798641a 100644 (file)
--- a/plat/arm/board/n1sdp/n1sdp_plat.c
+++ b/plat/arm/board/n1sdp/n1sdp_plat.c
@@ -21,7 +21,6 @@
 const mmap_region_t plat_arm_mmap[] = {
        ARM_MAP_SHARED_RAM,
        N1SDP_MAP_DEVICE,
-       SOC_CSS_MAP_DEVICE,
        {0}
 };
 

diff --git a/plat/arm/board/n1sdp/platform.mk b/plat/arm/board/n1sdp/platform.mk
index c9acb49112a1a4f11845b5efea1f5a4d7c71afef..2b68f657eb4b1547ae503e98b5e61ba26f495138 100644 (file)
--- a/plat/arm/board/n1sdp/platform.mk
+++ b/plat/arm/board/n1sdp/platform.mk
@@ -62,6 +62,5 @@ HW_ASSISTED_COHERENCY                 :=      1
 USE_COHERENT_MEM                       :=      0
 include plat/arm/common/arm_common.mk
 include plat/arm/css/common/css_common.mk
-include plat/arm/soc/common/soc_css.mk
 include plat/arm/board/common/board_common.mk
 

diff --git a/plat/arm/css/drivers/scmi/scmi_private.h b/plat/arm/css/drivers/scmi/scmi_private.h
index a4f417976da77b0c5caa4a68f0013b964edf25cd..65305736c7c7f43b971620f91216020f2ea79358 100644 (file)
--- a/plat/arm/css/drivers/scmi/scmi_private.h
+++ b/plat/arm/css/drivers/scmi/scmi_private.h
@@ -7,6 +7,8 @@
 #ifndef SCMI_PRIVATE_H
 #define SCMI_PRIVATE_H
 
+#include <lib/mmio.h>
+
 /*
  * SCMI power domain management protocol message and response lengths. It is
  * calculated as sum of length in bytes of the message header (4) and payload